Wrap the codes to handle key with TAG_STORAGE_KEY am: 42ac1c281f

Original change: https://android-review.googlesource.com/c/trusty/app/keymint/+/2918809

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