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

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

Change-Id: I0bff5a7d2f9d1267f030c2d8ba7065dd906dbf0a