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

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



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