Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296

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

Change-Id: I1e1a8a324c441f6992414eeafc99b2cec908982d