Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: 8f40ffebae

Change-Id: Id517f4122c4b078d16035274e8979247bc0b40f8