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

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

Change-Id: I8a7778440e4a6aab846b3028820d7389fab5287a