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

Change-Id: I8ad711638037e5ccd1053987bb1776ebacd0369f