Update fix for issue 147928666. am: bb1d95a02e am: b23e9c1375 am: 1a3f0b9b4c

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/12186308

Change-Id: I274476093bd9287bf5b3f8c7b8f1bada6b40fde4