Merge "Fix light reveal state" into udc-d1-dev am: 333034c692

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

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