Merge "Don't show lockout messages over occluding apps" into udc-qpr-dev am: 08d190da

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



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