Merge "Change isManualNetworkSelectionAllowed enforce permission"
am: fc527c4cce

Change-Id: Ief203d9238093568c7b06ee0f085b38ca882e6c4