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

Change-Id: I7fa567b7af041bf2557cdc1d97a73440758ceb0c