Merge "Fix selecting phone account dialog show error." am: 12095062b3 am: 603f062f7a am: b0406b16af am: ba8225eef4

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1428938

Change-Id: I2e7108df133ba5faf4ce3398767ec680fa5f1387