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

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



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