Merge "Fixes bug where the camera app would launch below the lock-screen" into...

Merge "Fixes bug where the camera app would launch below the lock-screen" into tm-qpr-dev am: 30ee980e am: 1aeb6f1a

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



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