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