Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18

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

Change-Id: Id1883f7c7209ad1e8ab5bd097467886d897116a2