Merge "Don't include mockito in frameworks-base-testutils"
am: f924642729

Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7