tree a3d0c654c50574c45c7952ea3a83c34c36aba151
parent 18fe57024ee2c11a49066bb77753d680b8a7128a
parent cc499885490129eb174a8eaa83735a94b682f437
author Remi NGUYEN VAN <reminv@google.com> 1648028534 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648028534 +0000

Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549

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

Change-Id: Ic9da645ff4fb81565a8ee5cda0627e997a9633ce