Merge "Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev am: 8bba760b4f am: cb68c2559c"