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