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

[automerger skipped] Merge "Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..."" into sc-v2-dev-plus-aosp am: a64720da -s ours am: 596e1296 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I59c4d084c0428fdcfd08251f6e35b92457685d49