Merge "system_server: TelephonyManager reads /proc/cmdline"