Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests"