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

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

Change-Id: I950496c87bfab4130dc0685c4bcd9e7d67277449