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