Merge "Fix broken test" am: 9d46224ed0

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

Change-Id: Id9ffe0af8072d6d14841f67127e9ff1cbcee75ad