[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -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: I858e2b22b6c38f250e4f216df984dbae9f77471a