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

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

Change-Id: I0326cc9677a8264b360828f17614bdbe9888a1ab