[automerger skipped] Merge "Undefine NAN before defining it again" into...

[automerger skipped] Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe33 am: 3e5ee9a6 am: 5742e2ba am: c5ba9b1a -s ours

am skip reason: Merged-In Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b with SHA-1 dd390faa is already in history

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



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