Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8 am: 7ed9fcda76

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

Change-Id: I9b5d1956ba54e6b3c833603926116ae571271192