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

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

Change-Id: Ifd504c77fb45ceee458899560e24a8c6e1dbfff7