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