[automerger skipped] Merge "Deep copy service state object" am: d3f9cdd5 am:...

[automerger skipped] Merge "Deep copy service state object" am: d3f9cdd5 am: 59622fab am: b3c724aa am: a16cc1ba am: ffa32f51 -s ours

am skip reason: Merged-In Ib6ad4ba26653ce5faad1e118a28d8be51435676c with SHA-1 579f130e is already in history

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

Change-Id: I4a65feb4a1440020a6ea474223ac6332f6c79d38