Merge "PhoneGlobals change ServiceState broadcast to listener" into tm-dev am: 429f28bd70 am: 075633e2cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/18155503

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