Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: 8f40ffebae am: 5a33553b0e am: 111d4f8e76

Change-Id: I09cf0b243adb6a8a1989d1cacb64c002e52c047e