[automerger skipped] [RESTRICT AUTOMERGE] Undefine NAN before defining it again am: 4dcd87fbef -s ours am: 6daeb10167 -s ours am: ad200e7315 -s ours am: 5a83416f6a -s ours

am skip reason: subject contains skip directive

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

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