Merge changes I0b88bc8b,I60d884db,I436858e7,Iaaace0e6,Ie7ee84c3, ... am: 0a822f8f41

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

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