Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d am: 6af3dd0f am: 3fa89083 am: c9ee3558 Change-Id: I7fa567b7af041bf2557cdc1d97a73440758ceb0c