Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79
am: 6af3dd0fc3

Change-Id: Icef7c38313576219b4a55eb10648297b18597ef6