Merge changes I0b88bc8b,I60d884db,I436858e7,Iaaace0e6,Ie7ee84c3, ... am: 0a822f8f41 am: 3a3d03e5da am: fd37134dfc am: f1e1f752a7

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

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