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

Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc