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