Merge changes Ie68356a4,I2b63c24b am: d6a5303cd8

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

Change-Id: Id3cb1919302d5c232ac9ec4149eca9c3a6821c70