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

Merge "[Bugfix]check whitelisted packages exclude nonsystem app" am: bd37127e am: 5e690319 am: 7606d5e2 am: 1ea264c1

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



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