Merge "Cleanup animation layer" into sc-v2-dev am: 7cf13cf4d8 am: 0a36e8cb0b

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

Change-Id: Ib12b8aec344ca0552343473e03d94b67729e99eb