220e7854bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808 Change-Id: I5d40f774391b43b51c8945ca93c8d34a3b8312d2