Merge "Update libphonenumber to v8.10.20" am: 116b804221
am: 5ed56ee621

Change-Id: I0afea1eddf400bea06a7dcdb5f6685167647ec88