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

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



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