Merge "Fix AnimationLib Test not running in presubmit" into tm-qpr-dev am: 18b4a499

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



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