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

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



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