Merge \"Add carrier config for close connection after MMS request\" into nyc-mr1-dev
am: f2598319c0

Change-Id: Ia16874474f755b601a02032e34b8dbff81971af8