Merge "Fix stack overflow in PhoneNumberUtilsTest" am: 524720d2 am: 88324e48

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



Change-Id: I51af0e7657d32b8177de92f16cc60068e3a6bae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>