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