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
Change-Id: I8077f0ce77fbca121d606be650b7ba4d2c3e21c5