Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382 am: c6241c1daf am: c034535e78

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

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