Merge "Fixes AOSP EmergencyDialer failing to occlude Keyguard" into tm-qpr-dev am: c9e16364dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20627834

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