Merge "Add security version to config descriptor" am: 1d23120b am:...

Merge "Add security version to config descriptor" am: 1d23120b am: abf29697 am: 411d1dcc am: 790b5d23 am: 77bacb8d

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



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