Merge changes from topic "revert-16943318-presubmit-am-bc566b73c1674298b82a1153c03313a1-GMQPQDTARU" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..." 2p: 01c3d11b83
  Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."