Merge "Do not hold PM lock when calling AppOpsService.removeUser"