[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -s ours am: 2c960293f0 -s ours am: 8c85558acf -s ours

am skip reason: Merged-In I63bba8ea809a12571ddc88cd1d20f2adeedf0b30 with SHA-1 2dd55590fd is already in history

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

Change-Id: Ie9390e5fcd1ac6af998e01a3905a06ce61a599ad