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

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

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



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