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

Change-Id: I9cc8522ee163b3567ee6a5c27cda2c2c70070015