Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: 00f3afec am: d8cdf2d9

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



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