Merge "Reland allowing MockitoAnnotations.* as static import."
am: 7a00bf40dc

Change-Id: I7596362feebd22a724449bd98ccc34f3dbfaf629