Merge changes Iab0ffbb5,I2cbe9906 am: 583d0d437a am: 7b05cc964a am: 98713f6339

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

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