[automerger skipped] Merge "Prevent exfiltration of system files via user...

[automerger skipped] Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735ef am: 5b62c515 am: 8c10a6aa am: e35d1122 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history

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



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