[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: 2bf74640 -s ours am: 5e2fc27b -s ours

am skip reason: subject contains skip directive

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



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