[automerger skipped] Merge "Set scan flags correctly for preloaded applications" am: ed70e4de86 -s ours

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

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

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