Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18 am: 9484df98a4 am: d8a804ffc0 am: 0dce1b246a

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

Change-Id: If8d8bfed90df9eed6cf788b4a2d9a99484dafdc2