tree 95e0e78aa7c5cda74510f7cffbc33ee5a420a8f5
parent 1dff3bdc507aa9a3871764275aa0eb064d66e24f
author Cassie <xih@google.com> 1525814898 -0700
committer Cassie Han <xih@google.com> 1526421670 +0000

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

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