[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e2eb1e1b -s ours am: f673ed26 -s ours

am skip reason: Merged-In I2b6bba0a948de475b3b9f2594a3595916f633da6 with SHA-1 81263271 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1740461

Change-Id: I1e09a00d2552ca47c852b545d156ccd1e48b3e55