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

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

Change-Id: I7c40cbf19f34677db3c3a96af64affaaa4ce0925