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

Change-Id: If79e80dba8b6c8dd69e8221603426b71b22527f7