Merge "Allow com.android.settings to have CONTROL_UI_TRACING (2nd try)"