Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
am: bc6dc5c20c

Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377