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

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

Change-Id: I22b51221894c8e5eb09ee9ce0694bbb2a7a37b9e