tree 480767ef12205926fa5939ab84a8326a941c45a9
parent 09ff886960d3f4239fc546d9ff48a1390f5f3cc0
parent 3486eacda3563c0420e1a1d29c16876092b02eca
author Mariia Sandrikova <mariiasand@google.com> 1639864771 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639864771 +0000

Merge changes from topic "camera-compat" into sc-v2-dev am: 3486eacda3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16468379

Change-Id: I1e56abcef9715a3dd6a00d70cb815c4d9260175a