Merge "Make android.test.mock use api_srcs instead of jarjar" am: 6fc7c62572 am: 851f8a23ea am: 197b142e96 am: 9c09c1bfde

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

Change-Id: Ic205cd1ddcf332ebf8a3a059a6a3b8c429ae5e81