Merge "Fix LightReveal Scrim animation flickering" into udc-dev am: 9f200877 am: e4f9f4de am: be79933c

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



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