Merge "Remove animation controller" into sc-v2-dev am: 1cb6db3310 am: 95e54713fc

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

Change-Id: I348fcdb51234597c020d85be9ae26b3c11861b11