Merge "Fix animation mismatch between privacy chip and persistent dot" into...

Merge "Fix animation mismatch between privacy chip and persistent dot" into udc-qpr-dev am: d606b89c am: ec2ab0dd

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



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