Merge "Merge "Add carrier config for exit hysteresis time" into qt-qpr1-dev am: 3010c40175" into qt-qpr1-dev-plus-aosp
am: f17298b349

Change-Id: I411cf70136c2acb8e2b2cf8abdcd6848a6647813