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: e592008c am: 5989cb91 am: d4be2bb6

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



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