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