Merge "[AWARE] Configure NAN (Aware) VTS tests"
am: 49b90ab4f6

Change-Id: Ic9dc64e4b75f788e72293956718f80d6808cd023