[automerger skipped] Move EXTRA_SERVICE_STATE from Intent to ServiceState. am: 3ee618bbf5 am: 4349d2d937 -s ours am: d1e1049cc4 -s ours
am skip reason: Change-Id I9fe6e904291affb1cd7b705212d47525b61a5679 with SHA-1 bb61b17cd9 is in history
Change-Id: Idf6bedb18a536ad0ba71d16d715099496401dbaa
This commit is contained in: