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

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

Change-Id: I2c4f20ec0310fbafed076748e313e2831b4b6b82