Merge "Add VSR annotations for RKP DICE" into udc-dev am: 06a5cc8adf

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

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