Merge changes I8f22b022,I41daef08 am: 24c5510ff6

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

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