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