Merge "[NAN] Update API javadoc to clarify NAN status change broadcast scope [DO NOT MERGE]" into mm-wireless-dev
am: cf18a2c85a  -s ours

Change-Id: I4f64e01cfd9179ad728e2d38ce15870e6248fd31