Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630

Change-Id: I71c32a98356d268d90b8c99345041fedd023b06e