Merge changes Ie68356a4,I2b63c24b am: d6a5303cd8

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

Change-Id: Ic4fd9283664c3234a7f1bb34890f8e7fc7451155