Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9

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

Change-Id: Ie28b41508c9d9f8cc89dca5a621d4cc309ba8654