Merge "Fix watchdog when NaN lux is reported." am: 8f870ada am: 8f7b85cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2319253



Change-Id: I1eef09e0c3ae970e822c95883907e92a3434b79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>