Merge "API Review: getManualNetworkSelectionPlmn"