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

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

Change-Id: I7a1067e4d2c7ff8af697b9e65304f6cf7b34ba5d