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