Merge "Add back off timer configs as carrier config" into qt-qpr1-dev
am: 772358beb6

Change-Id: If636a77aad26311092305ab1d090fc982da9af94