Merge "Attaches source for camera launch when unlocked." into tm-qpr-dev am:...

Merge "Attaches source for camera launch when unlocked." into tm-qpr-dev am: 4b452106 am: 924cd25b

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



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