[automerger skipped] Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev am: 1c91d9ccdc am: 9628abbe19 am: 28836d4d91 -s ours am: f79b94eaed -s ours am: a16543aae8 -s ours

am skip reason: Merged-In Idb0c991ab12ae75687236f2489e639e4422a0225 with SHA-1 0d520e8e17 is already in history

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

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