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 am: c54ff0d9

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



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