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