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

Change-Id: Ia6641e6037247edf3f5641fd473bbd0d97430e60