Merge changes Ic6ff7a3d,Iff9b9792 am: 5d787feef0

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

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