Merge "Prevent exfiltration of system files via user image settings." into...

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

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



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