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

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

Change-Id: I5f0183de1049dc0452dd3779b0b2965d75967352