[automerger skipped] Merge "Add NR state change logic to data activity changed event" am: 25cc8767 am: 256de851 -s ours

am skip reason: Change-Id Ieab5ffcb423a833456c25794ada366aee51db120 with SHA-1 ceba3ddf is in history

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

Change-Id: Ie8b6a8eb840f2c106b7ca34899c7a13cd58d229e