Merge "[Bugfix]check whitelisted packages exclude nonsystem app" am: bd37127ef1

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

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