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

Change-Id: Icf2c9d806e9156488b278dd7dbaade729791bec6