tree 0ac07c46aea7640345e285a9d3907368be5baa6d
parent bf0b895c05cb37cd22fe877eb77298d94aecad69
parent 53c63c8d654602d4c02fc41dd3e6787629aad802
author Xin Li <delphij@google.com> 1644562687 +0000
committer Xin Li <delphij@google.com> 1644562687 +0000

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

Bug: 214455710
Merged-In: I74c20512b392f8eef0dbf98c085d812a8a4d6c57
Change-Id: Icc3624f3ffef3ca8f9168473ca92f628e17e65c5