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

Change-Id: If4bb1d2eebc5de508d5ce8cb87ac29ba8e8c7299