Merge "Add isManualNetworkSelectionAllowed api" am: 9506ac69ee
am: 1dfcdbf0b0

Change-Id: I8115f2e7a0160a1963e03f65d82f052c62e4c820