Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549

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

Change-Id: Ic9da645ff4fb81565a8ee5cda0627e997a9633ce