[automerger skipped] Use MIN_MATCH 7 for PhoneNumberUtilsTest am: 1d533f17 -s ours
am: fe474e65 -s ours
am skip reason: change_id I7a7fe9a26e96b8530bf3d24c66bfe2d436d0b128 with SHA1 c487692d is in history
Change-Id: I42ad0f9e0f5d2c8558de28ba673939c86624ed04