Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417 Change-Id: I5714b36c6f0f71887848aa8aa41697fca6c409aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417 Change-Id: I5714b36c6f0f71887848aa8aa41697fca6c409aa