Merge pull request #10981 from JosJuice/android-string-single-choice-naming Android: Clean up StringSingleChoiceSetting naming
