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: Idcbee0086c70b63a03386f2ce99ed7e6bb3d2f46