[automerger skipped] Merge "Fixed MMS data connection not re-established after...
[automerger skipped] Merge "Fixed MMS data connection not re-established after airplane mode" am: 1db513da
am: 22445ab6 -s ours
am skip reason: change_id I25b69542f70cdab9a415606abcebd9c96578972f with SHA1 b7814369 is in history
Change-Id: I5c7ae7993a04cd8b29b2cf242e18883b65360bf4