Merge "DiagnosticsTool permissions for accessing touch calibration interface" into udc-qpr-dev