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

Change-Id: I06d4ce8bf1b5ea985c5deda2e2d0fe5b1e7d79e5