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