Merge "Update EAT code for cppbor Map changes." am: a26311b397

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I274aa2ddb6289cbb354e9bf63e1e5c43d9ad69e4