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