Merge "Merge "Apply a maximum time to Screen brightness RampAnimator." into...

Merge "Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev am: 7cda9b01 am: c26ff2d8" into tm-d1-dev-plus-aosp am: 9cd1f932

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



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