Merge "Fix AccessPointPreferenceTest#refresh_openNetwork_updateContentDescription"