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: 90f70aaf
Change-Id: I7957fb9bbdc2cd0e73ea97189ca5368bfc072dbd