[automerger skipped] Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main am: 3cef7f7b -s ours

am skip reason: subject contains skip directive

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



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