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