to default wallet selector. Bug: 283989236 Bug: 313968146 Test: Manual Change-Id: I984497baa1689d1b31eedd6a4f9ab453b10dd93c