Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2173585 Change-Id: I858fad97870daca80c585cbbbda734975dab3b85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>