Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system...

Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2 am: 8aa6d201""" into tm-d1-dev am: c2da54f2

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



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