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

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



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