Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735ef

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



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