Merge "Set scan flags correctly for preloaded applications" into tm-qpr-dev am: 92a6541d

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



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