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

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



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