Merge changes I54d367fd,Ib789dc59 am: aa257b1449

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

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