Merge changes I00d1aa47,Icffbe67f am: 77f2e95515

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

Change-Id: I59255aaea77c826accc2198ca7f01fca4b57c93f