[automerger skipped] Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321 am: 2a4b3ede -s ours am: b771d2dc -s ours am: cfa4e77f -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: Ia651f0c655c3d1c16a62d3789f4518fa4ef75b34