Merge "Add ACTION_TETHER_SETTINGS" am: 77e6024c01 am: 06c0f60a2b am: 5e7e9b09aa

Change-Id: Idfc4b99208b07e8a556a9350065de63ac06ac194