Merge changes I197fbfb8,I6375e771,I48536927 am: d3e793d8a1

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

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