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

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

Change-Id: Iecf18508145ef2674b77c6b090d733e96e0beef5