Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8 am: 145ac6e444

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

Change-Id: I64ff8756f56f4506ee1c4c35a60b9a8c95f68772