Merge changes I11d77e8a,Id988da4f,I51735fdb,I3df00ebf am: 796f33f3d4 am: e453de1c29

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

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