Merge "Pregrant non-system preloaded apps" am: 86ba6546 am: 21d92f04 am: c7d9a972

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



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