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 am: 70d109f5
Change-Id: Ic095d7f4423c3fbe8b7c88fee6b013c08325654e