Merge changes I1239e797,I4b1d3e25,Iefccc931,I122dc886,I1650bbc2 am: 02a58cf292

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

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