Merge changes I2c3242f8,Iaa67d5ae am: b3bf5fedab

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

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