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