Merge changes from topic "tangor-keyguard-notifs" into tm-qpr-dev am: c3de1864 am: aeaf56fc

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



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