Add extra transaction protections.

core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt

@@ -17,12 +17,16 @@ inline fun <T : SupportSQLiteDatabase, R> T.withinTransaction(block: (T) -> R):
   beginTransaction()
   try {
     val toReturn = block(this)
+    if (inTransaction()) {
       setTransactionSuccessful()
+    }
     return toReturn
   } finally {
+    if (inTransaction()) {
       endTransaction()
     }
   }
+}
 
 fun SupportSQLiteDatabase.getTableRowCount(table: String): Int {
   return this.query("SELECT COUNT(*) FROM $table").use {