[automerger skipped] Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 am: 8f6335b3fa -s ours am: 14f88702b1 -s ours

am skip reason: Change-Id I9802b8712798054a85307e549fb665bc85166311 with SHA-1 3a3af2fc2f is in history

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

Change-Id: I8274b830ce1c74bd116ec289ae2db98ccc1a1ae9