Merge changes I6b9a2fa1,Ia5ddbdc5 am: 655a024846

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

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