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

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

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