tree f2d677dc5798e98524ce905d576873c275b856af
parent e001eaf171acb5d3b893e4836358fea84fdafa5a
parent ae6d7db49a801ffd2a5b5b004d5c6ac5992ad64a
author Eran Messeri <eranm@google.com> 1675192370 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1675192370 +0000

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

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

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