[automerger skipped] Merge "Implement the CarrierConfig for call indicators"...

[automerger skipped] Merge "Implement the CarrierConfig for call indicators" into sc-dev am: 11cbeca7 -s ours

am skip reason: Merged-In I54386cb7399c7e3b3160ad01e09cb71f7e1f1a6e with SHA-1 9b3ee672 is already in history

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

Change-Id: Ia7d8bc19997a02ad0623fd20a0aab772f562e5a5