Merge "Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f" into stage-aosp-master