Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549 am: c98c1c1e7e am: 9746e6f346

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2036763

Change-Id: I85e99de33f416f166a4de8e45bf66b60a5ac9d5b