Merge "Refresh carrier service state when carrier app is en/disabled" into...

Merge "Refresh carrier service state when carrier app is en/disabled" into tm-dev am: a8dc91f8 am: 666271ef

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



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