Merge "Grant CONTROL_UI_TRACING permission to Settings app (2nd try)"