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

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

Change-Id: I1b06308be71da29f3c6b9cba16948a40d0cb1f05