Merge "Revert "Revert "Extract camera launch code from NPVC into Centra...""...

Merge "Revert "Revert "Extract camera launch code from NPVC into Centra..."" into tm-qpr-dev am: 4264971f am: 5692043b

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



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