tree ff108643042b4b5e376f07dbefeb8fce0d711011
parent e8af919cdf0072fd04b6d83a553c80124d6a9368
author Alexander Dorokhine <adorokhine@google.com> 1611724574 -0800
committer WenHung_Teng <wenhungteng@google.com> 1617715811 +0800

Fixed camera-testing compatibility issues to the Android 12

This is synced from ag/13402743,
also solve the merge conflict in aosp/1653830

Test: ./gradlew bOS

Change-Id: I9f29c9be63ea022643cb77408203dd6b143ff139