[automerger skipped] prevent overlays on the phone settings am: e827d8f13c am: 8b6e49c268 am: 81a2fc9662 am: 247b2acf94 am: 3993e20efc am: ab7d024fa9 am: 3abfa6b5e5 am: 7b4b8687b7 am: 0a6068359f -s ours

am skip reason: Merged-In I427b65bc6c1acf06676e1753a34a7a38e21bbae0 with SHA-1 79f9cf9cef is already in history

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

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