Merge "Synchronize when writing AppOpsService.mUidStates to file"