tree de3bf5103a7c49ec8ee2608a8b65dc454f773ba1
parent e69a650f4b9ae9a94519c77c0ade482b3a0c9e90
parent 14ed814204ffee87f6fe59bc967778cdaadaee18
author Fred Chiou <fredchiou@google.com> 1636098969 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636098969 +0000

Merge "Revert "CameraServiceProxy: Clean up app compat overrides"" into sc-v2-dev am: 1b639213de am: 14ed814204

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

Change-Id: If952570e95ab31c44c4369bd29f493ce43b7eb28