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