[automerger skipped] Merge "Add security version to config descriptor" into...

[automerger skipped] Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev am: 1c91d9cc am: 9628abbe am: 28836d4d am: a17e6393 -s ours

am skip reason: Merged-In Idb0c991ab12ae75687236f2489e639e4422a0225 with SHA-1 95318f29 is already in history

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



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