Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev am: 1aced77c2e am: fc25cbb078

Change-Id: Ic6ddb1518faabdb74ef4cd2a857e6a0b23c5df65