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

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



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