Merge "Slightly more realistic shade transitions" into udc-qpr-dev am: bdaad74d am: 87d93384

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



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