[automerger skipped] Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321d7 am: 2a4b3ede3e -s ours am: b771d2dcfe -s ours am: cfa4e77f83 -s ours am: 965b3da8e5 -s ours

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

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

Change-Id: I23c0dffa065fb9897ad7d4b37a9746efb1374a27