Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321d7

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

Change-Id: I8f111bf136e9ce7ef53a91468cdb10ff571eec2f