Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe33 am: 3e5ee9a6

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



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