Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d

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

Change-Id: I480d4d7cea8d6009ef71e0bf30f6d7a18dd99783