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

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

Change-Id: I5debd8529ba5018ef421ca0dd1fc41905c014ac2