[automerger skipped] Merge "Don't clear NR state when screen off" into...

[automerger skipped] Merge "Don't clear NR state when screen off" into udc-qpr-dev am: d834b7a2 am: ee3b14fa -s ours

am skip reason: Merged-In I783f94afd68912f28e0cc16912ee0b078cb2c299 with SHA-1 53125661 is already in history

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



Change-Id: I50931b88a086f79d079dc1034c1b887995ebc6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>