[automerger skipped] Merge "Set scan flags correctly for preloaded...

[automerger skipped] Merge "Set scan flags correctly for preloaded applications" into tm-qpr-dev am: 92a6541d am: 7b77eb23 -s ours

am skip reason: Merged-In I2ba73fcfcc46d7ddf14c2fb4dbf877f3252e7a50 with SHA-1 d827ef2d is already in history

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



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