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

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

Change-Id: Idab1c27364cd91047b48b997db35521d72c17fe3