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

[automerger skipped] Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..." am: 26e383f6 -s ours am: b7d5b256 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0ea5d824f456c314c23e64fad3b205b37c16378c