Use separate catch for getTcpKeepalivePacket

Having a combined catch block causes the code to be "optimized" by R8 to
just throw a NullPointerException, with smali code:

  const/4 p0, 0x0
  throw p0

Workaround the issue by having separate catch blocks instead.

Bug: 217391956
Bug: 226127213
Test: atest ConnectivityManagerTest
Change-Id: Ib51fc66c44e1c2baa1f7ba4d1b0c2d1c94c3591d
1 file changed