[conflict] Merge "[Bugfix]fix NullPointException when PackageInfo's verifiers...

[conflict] Merge "[Bugfix]fix NullPointException when PackageInfo's verifiers is null " am: 56535ae5 am: 28f1ea0a am: f38ef8a9

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



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