[automerger skipped] Merge "Fixed service state changed event" am: 372b449b...

[automerger skipped] Merge "Fixed service state changed event" am: 372b449b am: 292e308e am: 2d973aba -s ours am: 23f1f86b -s ours am: d2ea0ff2 -s ours

am skip reason: Merged-In Ifd988943a3f6e22ec563417eea6f173c02a866e2 with SHA-1 6d94e1c2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034524

Change-Id: I802540019545c3d4c4fba70c99059a926f07ad74