Merge "Revert "Extract camera launch code from NPVC into CentralSurfaces"" into tm-qpr-dev am: 8726760ff9

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

Change-Id: Ib320da24a64364da5ef9d2bfe0b6275f0a95a3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>