Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549

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

Change-Id: I39d18e945e475aeecda1b0b4df9c6925977cf622