Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: a7e74b30f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib92977574ffb28cd2e455328260f215352f24b32