Merge "Move AccessPointPreference.generateApKey."