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 am: 3460355b am: 22efc2ca

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



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