Merge "Ensure await lux calls are completed when there is no sensor activity." into tm-qpr-dev am: 7fc8c3b3e6 am: 7524b5994c

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

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