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

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

Change-Id: I3d2b0899f591fd77013d0837d014372ed5321d16