Merge "Stop complications from hiding if animations are disabled." into...

Merge "Stop complications from hiding if animations are disabled." into tm-qpr-dev am: dccbda11 am: 260e9b1d am: 4adc9cca

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



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