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

Change-Id: Ia6a5877bf5ca52cf65b2ee7a85642a00b208428f