Merge "SQLiteWrapper cleanup, removed unused checks." am: 4ec097baa6 am: 4708919e7f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927385

Change-Id: I3f68174cbaeef54b740c70a80557a4cd330830fd