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

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

Change-Id: I2ff7d271ecbb1832e772bb93ac2381d0ec2228d5