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

Change-Id: I5a26b60dcf8a6925a62faffa63df6e274c6a5eb2