Merge "Change isManualNetworkSelectionAllowed enforce permission" am: fc527c4cce am: 5a7b21bfa4

Change-Id: I43f13a01c0e2987c6a8ccc7e37a04dfe6ba3b8fe