[automerger skipped] Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp am: a40db3343c am: c3835ade2a am: 810b80e2b6 -s ours

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

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

Change-Id: Icac15826efa4529db8c189e9b414669b9be5faa8