[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am:...

[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e -s ours am: 2c960293 -s ours am: 8c85558a -s ours am: 25bd3878 -s ours am: 5d56f7da -s ours

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

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

Change-Id: Ib708691580e5340353ca23439da5a5774e7f2af5