Merge "Remove unused android.test.DatabaseTestUtils"
am: 3724e7e5e9

Change-Id: Iebf38b15aaae0317935fe00e07d00cf806ab5942