[automerger skipped] Set scan flags correctly for preloaded applications am:...

[automerger skipped] Set scan flags correctly for preloaded applications am: 73d44868 -s ours am: 0a066be5 -s ours am: 651137b0 -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: I651f6a91cdf97d735b3854d13e27f1a52ed851e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>