Merge "Allow system UID to call isSecurityLoggingEnabled()"