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

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

Change-Id: Iac02fd95748f37b001089075c70a075e67e64274