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

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

Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7