[automerger skipped] Merge "Notify service state change when subId goes valid"...
[automerger skipped] Merge "Notify service state change when subId goes valid" am: c8d6062a am: 03db311c am: 0023fdf8
am: 8fb799ce -s ours
am skip reason: change_id I42ee6940f7d5b8458e8a17cde0a88a4cf156a092 with SHA1 953c5c10 is in history
Change-Id: If1b5f40e4fb4b1640274b9f34568ae7ae2cfc3c6