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