Fixes: 110093185 Test: ChannelListPreferenceControllerTest Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f