Merge "Separates SFPS and UDFPS BP animation logic" into tm-qpr-dev am: 245bba607f

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

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