Merge "Add carrier config for NR timer reset" into rvc-d1-dev am: 08a86e72 am: b74784d9 am: f75db473

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086305

Change-Id: Id7ef6dc10eeb988d900bc3842eee9d9923e35a78