Merge "For API Review: getManualNetworkSelectionPlmn"