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