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