Merge changes I8157c373,I495db18d am: 9e54059c5d am: 733debc86a

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

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