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