tree aede9405e4fd7b10a070020daeef063e69baa0f4
parent 17561f2af1dd2b9b33fb49af94095721ac8c1c69
parent 5976b9813c8e1a380d55c236fc8c66957729f136
author Xin Li <delphij@google.com> 1650315668 +0000
committer Xin Li <delphij@google.com> 1650315668 +0000

Merge sc-v2-dev-plus-aosp-without-vendor@8433047

Bug: 226662282
Merged-In: I310e7924c7767b24b697fc96a098b37db4cf1216
Change-Id: I8bd98ceff90846a20679bfb6c55b37c1765fd13b