[automerger skipped] Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f
am: 50b6388ad3 -s ours
am skip reason: change_id I48053f3ae7ed8ce5c24e7406d66c442023ff8882 with SHA1 7d0cabc2f3 is in history

Change-Id: I6a7c4a45883b0b50c03f6cd9bc66cf629b911011