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

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

Change-Id: I58ece08470ea323331817af8a7f0b1cc15ad2c54
Signed-off-by: Automerger Merge Worker <[email protected]>