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

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

Change-Id: I6e1479c2cc68d169dc8b9e9fcc5610c1db03caee