[automerger skipped] Merge "Add two cases for device resets NR timer" am: 8806888a am: 3dea8a46 am: 0329cad5 -s ours

am skip reason: Change-Id Iaaa3d21b36a56a63a5340173db0462e1fdf4e240 with SHA-1 bcbfa5a6 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1366757

Change-Id: Ic2bb92a04ebad80009c9f6e4291631afa855218d