[automerger skipped] Merge "Carrier config to switch data if primary is OOS"...
[automerger skipped] Merge "Carrier config to switch data if primary is OOS" into qt-qpr1-dev am: a115070c
am: af00f21c -s ours
am skip reason: change_id I2fbec74b7f00dcb751e38b0f5a336fea8370cbee with SHA1 8c04a5a5 is in history
Change-Id: I9dac7eaf26494a891af344b835565e12f355576e