Mark ab/6881855 as merged am: 6d86d72cec

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

Change-Id: I3a6449fda6f20c32a747df9f6a0285ac035e56c2