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

Change-Id: I9088e5dc52fec154c884bf5659378ae5bafba8fc