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

Change-Id: I59df6966eba2aa4a12bfb4081cd6b6a75c313210