[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: 125af579 -s ours am: c850d2b8 -s ours am: 8bdf5943 -s ours am: 8ed4a069 -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: I4e369713d9573e75cf075bc7682a958fcd00e48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>