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

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

Change-Id: Id9044edebdd0893ba4771bcad6a0242a31537a4c