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

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

Change-Id: I8f4894479b5520738672df5962febf4280191f10