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

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

Change-Id: Ice0291696167275ae20a423b74671d252fe09fb4