Merge changes I54d367fd,Ib789dc59 am: aa257b1449 am: 0f95966874

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

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