Merge "[NAN] Use NAN capability information to validate configurations"
am: 141a2840e1

Change-Id: I247e246a2e74b7940eb9b8f30bc1bdbe14c30574