Merge "Add ACTION_TETHER_SETTINGS" am: 77e6024c01

Change-Id: Ibde5dfa7be0bd3e2db664b49f3a65eb618da933d