Merge "Change from literal to constant in AccessPointPreference."