Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee am: a79c963fa9

Change-Id: I82825eeded51f779325291cc1142cb1d6111915b