Merge changes I99d494d3,I208ceceb am: b5ebe944b5

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

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