Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af am: d5de41b6ff

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

Change-Id: I017930e80c66ad465e5d27d96e2b09159081308d