Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430

Change-Id: I6d9dc4e6fd3fa832efbafa4893cc20dccfe3d7a3