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

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

Change-Id: Id6951382cd12dff2e4f1bd2fe47d063c8998fc2f