Merge "Fix stack overflow in PhoneNumberUtilsTest" am: 524720d226 am: 88324e48e4 am: f139c54e2b

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

Change-Id: I667a54df58ce57729ce28d804e07288bfdd53e26
Signed-off-by: Automerger Merge Worker <[email protected]>