Bug: 126566208 Test: atest ChooserListControllerTest Change-Id: I4277a28cc7ad8a1f08c9a08ec018726161e5d596 (cherry picked from commit 363ed278)