Merge "Deep copy service state object" am: d3f9cdd5be am: 59622faba3 am: b3c724aa73 am: a16cc1babd

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

Change-Id: Iab8490adf97c37e6fe5b351d1d5f9d1e6902dbb4