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

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

Change-Id: I1ab99f85091ab9665851afc633ee6e67314abe78