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