Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev...

Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev am: 1c91d9cc am: 9628abbe am: 28836d4d

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



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