Merge "Clamp brightness to dim value if we're timing out and playing the...

Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev am: 8938a91f

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

Change-Id: I9bc548dd30781df29e879b4b4eda7827be585b92