Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev am: 83e2a25461
am: 838d795731

Change-Id: I903e773977787d35ade7c32afffb5e5e009c3a45