[automerger skipped] Merge "Fixed service state changed event" am: 372b449bbb am: 292e308e22 am: 2d973aba60 -s ours am: 23f1f86b26 -s ours
am skip reason: Merged-In Ifd988943a3f6e22ec563417eea6f173c02a866e2 with SHA-1 6d94e1c200 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034524
Change-Id: I0824c8eeda6f3a2dcfbdc830763fb5a2e4123853
This commit is contained in: