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

* changes:
  [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee
  [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"