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

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

Change-Id: I0dd648828054131fb67b0c4544b2a4098bee886c