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

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

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