Merge "Add isManualNetworkSelectionAllowed api"
am: 9506ac69ee

Change-Id: I1e20357d125e20bb35ceb66712b25ce47f3880be