Fix makeUniqueWithTrailingData. am: 2ac2bbb546

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15337456

Change-Id: Ieffd7af3962243039696730ef7a5065ad8b14f33