Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549 am: c98c1c1e7e am: 9746e6f346 am: 18bbef4b44 am: 989b397579

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

Change-Id: I62cad53059ef0704c35e1db7f58ab8a3b2e771aa