[automerger skipped] KeyMint VTS: check INCLUDE_UNIQUE_ID works am: 2f361c1571 -s ours am: aea20f2cc3 -s ours

am skip reason: Merged-In I8bc674b47549aa1133f816c510289774db752e04 with SHA-1 565ccc70ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16230165

Change-Id: Ib864e23a4cf1fa42fb2bbfd84cfc1271996c064b