Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev am: 7cda9b01

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



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