[automerger skipped] Merge "Add...

[automerger skipped] Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911" am: 6f61cdcc am: de7a581e -s ours

am skip reason: Merged-In Iab56a59d7cb17e3e8131304fbc906e101bb87b42 with SHA-1 d4dd13c2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1726551

Change-Id: I124d81dac836ef5c9e5267c83388b40859ee00da