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