[automerger skipped] Merge "Fix the ambient lux which did not update for...

[automerger skipped] Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev am: 61b61e49 am: 910b8754 -s ours

am skip reason: Change-Id Ibf2e7cb2e336c88a583f00f59abcbc9d06ec3d62 with SHA-1 6d728c2b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958365f957182c43027615fa3523e8161cfaa75d