Merge "Make the test suite device-tests." into udc-dev am: 3fdb9db0 am:...

Merge "Make the test suite device-tests." into udc-dev am: 3fdb9db0 am: 898d340c am: 9c73fd7e am: e48f93bb

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



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