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

Change-Id: Id87da8f0e49ef8095a290ba2393c237c6a15cf48