[automerger skipped] Merge "Restrict legacy apps to insert files to other private app dirs" into sc-dev am: 69760c7bdc -s ours

am skip reason: Merged-In I52481b24b137790d49845f1a4b00978c63ed183b with SHA-1 cd9d289cca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/16386044

Change-Id: I758e60793671e04e3b92b16a1cc9c5a3b3c685cc