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

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



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