Merge "Run more tests in presubmit" into udc-dev am: 0ba0ad0d am: 950b787b

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



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