Merge "Make SQLiteDebug @TestApi"
am: eb973c97da

Change-Id: I8a291106ab44682806e05025b31f17bbf841e9ad