Merge "Skip no-longer-supported signature/padding combinations." am: 340b1bc382

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2469824

Change-Id: Icae6c9fca06742af27b7f2775eca99d2e8334a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>