Merge "Fix light reveal state" into udc-qpr-dev am: c33c00a2

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



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