Merge "Set default preferred network only when registered on home network." into oc-dr1-dev am: bf11e47562
am: 80e37f1f42

Change-Id: Ic1c6149e7644e696f83b1cda62779a732ff189a1