Merge "Update fix for issue 147928666. am: bb1d95a0 am: 889bf0b6" into...

Merge "Update fix for issue 147928666. am: bb1d95a0 am: 889bf0b6" into rvc-d1-dev-plus-aosp am: 5274cdf0

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

Change-Id: Ic9ea704ae87f158a999005b41754943cc218535c