tree bd70d9c1ce31d5ab446268d4c828e0ec59713f34
parent 389a55fa0987aacfaaa44ed17a843fe81e3b01fe
parent 2198f75d1f66648f2bf1dd181bc647423a100e0c
author Xin Li <delphij@google.com> 1644563191 +0000
committer Xin Li <delphij@google.com> 1644563191 +0000

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

Bug: 214455710
Merged-In: I8d6aa6636beeca338ad1e30bcaf3e225484a315b
Change-Id: Iedf680eec5cc52617d70c78fda694e87f75c9a7b