Merge "Remove caption when keyguard is visible" into udc-qpr-dev am: 2e4f6656

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



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