Revert^2 "[nfc] Fix string injection in default payment app selector"

This reverts commit 786305ffd159b56108eb7450fcae7635df0cd12f.

Reason for revert: reland

Bug: 429417453
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:ff756588ba9249246b36012c44abafd23f7fc959
Merged-In: I57174f0a659d639c7ae4350be25fa41a40324ef5
Change-Id: I57174f0a659d639c7ae4350be25fa41a40324ef5