tree be7006a86f4e3a0997e0c8ffca969585829a077a
parent 9e0210622d8a5ea0a0b5f47429b1bae7d4c672f6
parent ecb4b6d1585fae6e03242b4c2c7b4c4131f6c8a0
author Eran Messeri <eranm@google.com> 1675184347 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1675184347 +0000

Merge "Keystore: Attestation fix in AOSP builds" am: ecb4b6d158

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237500

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