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

Change-Id: I669296387e2f1ae3bdee021378abf27a050574f6