Merge "Merge "[am] resolve service again when resetting userId in...
Merge "Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev am: 1aced77c am: fc25cbb0 am: 90f70aaf" into rvc-qpr-dev-plus-aosp am: af013f6f
Change-Id: Ic06ca0ad9c8aa74c8dfcd704a43800c7047cf867