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

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

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