Merge "Don't pass Tag::INCLUDE_UNIQUE_ID to attestKey" am: 13269794f6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2030544

Change-Id: Ic3b5f3714413fbab0547cd88bf901eeedbf2690f