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

Change-Id: I798de978e6cf5e28b74c80326b4d9f2640e63737