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

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

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