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

Change-Id: I4124f0e66e2ad0f0a4d6cb16cac1a459d00fcc20