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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a34d4357c55b2d2f6dbc187658a76d68a73397