[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" am: ae5bbc98 am: a0fc4172 -s ours am: 7fbdc316 -s ours

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

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

Change-Id: I6d6a0e3c4b3518a949cb95889f0e398056ebbeb3