Clean cherry-pick 'Fix the auto-select UI.'

Bug: 74572205
Test: manual test
Change-Id: I25723de661d055626b12f606ff7edfc22bb04aa1
Merged-In: I25723de661d055626b12f606ff7edfc22bb04aa1
2 files changed