[automerger skipped] Merge "Introduce CarrierConfigChangeListener API to...

[automerger skipped] Merge "Introduce CarrierConfigChangeListener API to monitor CC change" am: e302b2a3 am: 0aa2cf77 am: 046afd7a -s ours am: 076471de -s ours am: c8b04ca7 -s ours

am skip reason: Merged-In I782e3aa2312886279cc7f449fa3a8238b4115407 with SHA-1 c5e36e1c is already in history

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



Change-Id: I2a94ecd446118cdf855225ffbd064df54c043cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>