tree 8b34ba9c9d38bcb1fc607ac203f205b5ef42ac14
parent 74954de15a0d6730feac7f63c1a6338827d22abd
parent 86f86677d38008c9756c3c09d4036bd1baa17aac
author Yabin Cui <yabinc@google.com> 1686350290 -0700
committer Yabin Cui <yabinc@google.com> 1686350305 -0700

resolve merge conflicts of 86f86677d38008c9756c3c09d4036bd1baa17aac to android12-tests-dev

Bug: 286585422
Test: build
Change-Id: I4ca69cbfde11d05152a010f30b22acbac5fbbf0a