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

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

Change-Id: I62411c175dbbad21a6190e58bbface40f831d04f