Merge "Carrier config to switch data if primary is OOS" into qt-qpr1-dev
am: a115070c19

Change-Id: Ia92f65726f695efc13790a4160459cf6bbbae536