Merge "Fix incorrect phone number display in Bidi language" am: 4130d87543
am: fef1c4494b

Change-Id: I8f4adb5c5126cc434389bb0afda1e74b5b378475