Merge "Avoid spurious UsbAlsaJackDetector JNI log"