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