Merge "Fix tests" am: e281be634b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaedaa84e9e9ca5fe7c9206ae9d82e9de171ad016