tree 1c1997da8c301587fc4ad6c5cd699f5679d0364c
parent d541e21021c36f9f50ec9b6cf838aecc48aae055
parent 10b5d82d1ebf209d98e7d66b4c01c2e7e9bad498
author David Drysdale <drysdale@google.com> 1636966732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636966732 +0000

[automerger skipped] Merge changes from topic "merge-unique-id" into sc-v2-dev am: 10b5d82d1e -s ours

am skip reason: Merged-In I59f3f0c42b59e255346f68199fc9a4a9ed113818 with SHA-1 1379b9642c is already in history

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

Change-Id: If44990eac83e95ff3d06fa49d388398d169a354d