[automerger skipped] Merge "Make SQLiteDebug @TestApi" am: eb973c97da am: c8255eea82
am: 871e38a975  -s ours

Change-Id: I5199a3f8037b238a57c06ea55d448bf37948f158