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

Change-Id: Ic2709ce65df49467673cd63180f3620e4f47b473