Merge "Fix light reveal state" into udc-qpr-dev am: c33c00a26b am: 225a2b20f4

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

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