Add containsOption method to OptionSelectorController

And clean up the generics usage.

Bug: 185419553
Test: manual
Change-Id: I7b1e0cb565b19eab1b4abbe9f5eb9cb43f30cfd2
1 file changed