Merge "API review: setNetworkSelectionModeManual" am: a0e42af02c

Change-Id: I4c43b2d64b77ee7872892a81718edcf8625d0572