Represent NAN callback events as a bitmap am: 3f7bfd2dc5 am: 6b039c37e5

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

Change-Id: Ib072fa89afae63c5b5e4b6b36d0cecca68448598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>