[automerger skipped] Merge "Apply *67 and *82 for carriers in Ims/GsmMmiCode...

[automerger skipped] Merge "Apply *67 and *82 for carriers in Ims/GsmMmiCode as temporary CLIR codes Supress CLIR for emergency call in GsmCdmaCallTracker" into sc-dev am: f3ace853 am: 20df195e -s ours

am skip reason: Merged-In Id61fc30802c2647efafd22b0fa0a4d8095df89dc with SHA-1 ad9011e6 is already in history

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

Change-Id: Ib0aa46aaa1cebaee8d7780603b60ef0bc17f33b2