Merge "Remove Wi-Fi lock icons from AccessPointPreference."