tree 17a37151fc4662e19c1ed6caa88e013e33eb1deb
parent 3338be6f48a70d07cd61f6e6ee8e4b5f574b72e9
parent 0da38822dbabaf80309f1373c0e4bbc60ea25d06
author Xin Li <delphij@google.com> 1644564343 +0000
committer Xin Li <delphij@google.com> 1644564343 +0000

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

Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1