Merge changes Iab0ffbb5,I2cbe9906 am: 583d0d437a

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

Change-Id: If6345d50690b204e90f9de25feeb3ea8e5566c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>