Merge changes I2c3242f8,Iaa67d5ae am: b3bf5fedab am: 32afc832fc

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

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