Merge changes Ie1a91959,Ic189b2c0,I39d70e0a,Ibb5f1402 am: 929368eb1a am: b958891998

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

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