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

Change-Id: If4482e568b6d424e010a4e8f5d7c38d917840896