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

Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: 00f3afec am: d8cdf2d9 am: b4784aeb am: 027abf19 am: 6cc59ca4 am: 35b54f3b am: 1e3e7a95

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



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