[automerger skipped] Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main am: 3cef7f7bfe -s ours am: b2ecaba248 -s ours am: ac892dc7bc -s ours am: 2bf74640c7 -s ours

am skip reason: subject contains skip directive

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

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