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

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



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