Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: 9a573b1942 am: f00be6bdfc am: 68636fecf7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Iaa9cca7e41305a9161f97e5dd8181ef3824c403a