Merge "Pre-reserve space for unique ID input calculation" am: 24a9d1d4b9 am: a9007aaba5

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2322637

Change-Id: I27b951803640d2e17da8f98632077d1ad34da730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>