[automerger skipped] Merge "Add isManualNetworkSelectionAllowed api" am: 9506ac69ee am: 1dfcdbf0b0
am: 153793dcfb  -s ours

Change-Id: I21ee70f7fe8037ce60b45096ddaaf6b7cc1aa415