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

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



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