[automerger skipped] Merge "Only kill apps with storage app data isolation enabled" am: b2678b6654 am: 53d7796ccd am: dedb2c1a13 -s ours

am skip reason: Merged-In I45d9a63ed47cbc27aebb63357a43f51ad62275db with SHA-1 a58b535495 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1690874

Change-Id: I641a83e69e7b3ffc267997503cc741cb8a04f030