Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp am: a40db3343c

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

Change-Id: Idb40c95d92d17a3f4f3198c603b74b1698cd74e1