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

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

Change-Id: I5caddcc27100708a9cb30c921645485bf5d2e7f4