Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8

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

Change-Id: I66e4e1c5fd3d7042baefbcb328d008fdaf8c8443