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

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

Change-Id: I3551b8b7549f87e1ab5ec32c983691d0f5d2bd68