[automerger skipped] Merge "Revert "[DO NOT MERGE]Revert "Relax minimum...

[automerger skipped] Merge "Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."" into sc-v2-dev am: 115740d0 am: c18575a2 -s ours am: a6789266 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17110028

Change-Id: I2eec5fdecc3727f2a54d919fe5956b1525f6e05a