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