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: Ic17d1e47d3a610858a509484506e99ea1cbebfc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>