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