NAN R4 additional iface changes for WFA certification am: 2b3c3a49bf am: 04fd890efa

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/21526865

Change-Id: Ib96a2a5cc085121b252481e178c4283d0ddcc190
Signed-off-by: Automerger Merge Worker <[email protected]>