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

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

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

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



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