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

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

Change-Id: I3b268ab181e9fca02e9e0bc4e63c70e6c0a7e366