[automerger skipped] DO NOT MERGE Revert "[2/n] Camera Compat UI: Add...

[automerger skipped] DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a am: a274e1a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2379de9fabb3340867846ede79248165c2ea80a1