[automerger skipped] Merge "Fixed service state changed event" am: 21368bd7...

[automerger skipped] Merge "Fixed service state changed event" am: 21368bd7 am: 283e0e82 am: ef286dd0 -s ours am: 78ae0bc2 -s ours

am skip reason: Merged-In I04266ceea567fc498118fbb09362d9d8e5efa350 with SHA-1 5963f375 is already in history

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

Change-Id: If1d47ee75b513952bcacd9c402c40f20dfdf8b12