Merge "Fix animation target rule due to split screen arch change" into tm-dev...

Merge "Fix animation target rule due to split screen arch change" into tm-dev am: 992c55b4 am: dbf4f2a3

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



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