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

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

Change-Id: Ic44876c0fa7a6a179e8d8b3876d515e8aa4db202