Merge "Use PLMNs from SIM as to filter for network scan" am: b51dd5754d am: eba1391cf8
am: 5e236776e0

Change-Id: I4709537c32183e16315e6353b313dbec806abb27