Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18

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

Change-Id: Iaddd6b13996eb4453ba180055af5b7c9cd64ab55