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

Change-Id: I75396a31978c9f12e7273e89bcc12b596314fb7b