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

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

Change-Id: Ie0defc790cfdc374ebede07a97252418abac9a66