Merge "Don't check for UPDATE_DEVICE_STATS if the caller is the system server."