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: Ia2e7e77c5f5e99a2e5b6016befbb022d8edd4966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>