[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: b2ecaba2 -s ours am: ac892dc7 -s ours

am skip reason: subject contains skip directive

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



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