Merge "Make SQLiteDebug @TestApi" am: eb973c97da
am: c8255eea82

Change-Id: I77908f72147ee0682a307f23d708ab640ffdf4f0