Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8 am: 7ed9fcda76 am: 486abd5bda am: d5e07d385c

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

Change-Id: I84a3a0c4ddbab7b826171c53460e1c9462bb4697