[automerger skipped] Prevent GsmCdmaPhoneTest breaking by permission issue am:...

[automerger skipped] Prevent GsmCdmaPhoneTest breaking by permission issue am: 7ba844e3 am: 697f7204 am: b5d7bad7 -s ours am: 0f320eeb -s ours

am skip reason: Merged-In I324bfeb30264891fee22af4a96415538f4c07b8a with SHA-1 c7953caa is already in history

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

Change-Id: I4805c4e340eb0b92b7042d7f04e41527153f64f8