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

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

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



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