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

Change-Id: I5870aaca1787f0d6fd387c025481d1ba4d53f4a4