Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8

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

Change-Id: Icfad8c91eb1c77ae2801b40b8d5ef646211dd881