Merge "Allow shell/CTS to be package verifier." am: 99ada16f28 am: 6f6c520b90

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

Change-Id: Ia480bbf461f0009eb5573db36d8b0d7f4133eb69