Merge "Added android.test.mock to PRODUCT_PACKAGES" am: 87b69b97f3
am: b349e09a18

Change-Id: I242537e012490770a7a3bbdd235dc6016984804b