Merge "(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()" into qt-qpr1-dev am: 5811f47755
am: 6bf45f9967

Change-Id: I22668dd87ea1d22d01de56b0e8e87b70e059fd58