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

Change-Id: Iabf06bb45f3af3a1dc2b97b8869056c5693ed806