Merge "Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..."" into sc-v2-dev-plus-aosp