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

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

Change-Id: Ib75a13edd0956b66882903730a9036744de5bfbd