Merge changes I63467371,Id4405b70 am: 319c97705f

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

Change-Id: I9e3c33845d5a06c4fce2f53c665f59437e957f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>