Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d35c am: 8c349cff44

Change-Id: I02a786fbf6ea2b9378ba62159034ba42efb01e56