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

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

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