Merge "Fix the UPDATE_DEVICE_STATS permission for multiuser"