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

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

Change-Id: I7423959d65dadcb39e5c2635e7be8c8459ffa972