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: 23383e30 am: dc4bc7ee
Change-Id: I4653db091179d4bfb7c8c324fcf5dbe5fc3a150c