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