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