Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a am: 8cc60e436c

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

Change-Id: I4a13d4edd0548f5d2322608d788d57d08c423033