[automerger skipped] Merge "Improve camera launch time from double tap power"...

[automerger skipped] Merge "Improve camera launch time from double tap power" into tm-qpr-dev am: 84d0bab4 am: ccb0dc32 -s ours

am skip reason: Merged-In I99355b870d0c13335d719364a45f66cba31abb86 with SHA-1 02610078 is already in history

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



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