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

Change-Id: Iee06212929aef212ec1087235c736afb54336f0a