Merge "TelephonyManager#setAllowedCarriers: comment update"