Merge changes from topic 'am-436d8a53ff3c441ca434f7c488dbab82'

* changes:
  Merge changes from topic 'cherry-pick' am: e3d5fa10 am: 12b48830 am: e8e0ee07 am: 1c4749f6
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast am: 720d1757 am: 083f3137 am: a06821b2 am: 1a92c545
  [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8be am: c3066c1d am: 4cb72b61 am: 234039af