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 am: 8c10a6aa

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



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