Merge changes I488cc768,Icb9ed7ae,Ib18c3afb,Iba293b47,Ied55829c, ... am: de5adc4f1f

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

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