Merge "[AWARE] Support multiple NAN data interfaces (NDI)" into oc-mr1-dev
am: bad0137ff3

Change-Id: I8dc0e337b858f5d05d696d13dc3bc10a7ea93b45