Merge "Update libphonenumber to v8.10.21"
am: 7cc0cecd8c

Change-Id: I586568ccd8dc67d29ebf7486704518fbe7f711c3