[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321 am: 2a4b3ede -s ours

am skip reason: Change-Id I4678ace5b16ad06eacd8abf268960dd3bdb5a77f with SHA-1 4c739166 is in history

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

Change-Id: I4f834ce1bbbeba75eeb7c7b55a03bc848f6ce4e8