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