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

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

Change-Id: I2f696449f7d354c4fa62301d2897b58c2aa6f6d4