Merge "[NAN] Change Broadcast for NAN status change to notification only"
am: e1513a8cc6

Change-Id: I71c367bdeb395e330d57252bc77c9817e8870fb5