Merge "[am] resolve service again when resetting userId in...
Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev am: 1aced77c am: fc25cbb0 am: dc164f54 am: e7a4cfe6
Change-Id: Ia2b2942b8725333dfa3e901b2d6106141a3373c6