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

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

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