Merge "Merge "Merge "Add NR state change logic to data activity changed event"...
Merge "Merge "Merge "Add NR state change logic to data activity changed event" into rvc-dev am: 95ac639a am: 317bdae0" into rvc-d1-dev-plus-aosp am: 644f0b9e" into rvc-qpr-dev-plus-aosp