[automerger skipped] Merge "Add VSR annotations for RKP DICE" into udc-dev am:...

[automerger skipped] Merge "Add VSR annotations for RKP DICE" into udc-dev am: 06a5cc8a -s ours am: 44eab10d -s ours am: b96b9b61 -s ours

am skip reason: Merged-In I64e34c1f9865811f0967148cad914f7ef77f9448 with SHA-1 ac1639f2 is already in history

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



Change-Id: Ice2a304b3683c49470ee3c3d478036e3059b3d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>