[automerger skipped] DO NOT MERGE Open all files with O_NOFOLLOW. am: 8ca6dd56fd -s ours am: da6615572c -s ours am: 6ea477dd10 -s ours am: 27a36d9050 -s ours am: 8f5a08403e -s ours am: 9b9200e208 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I25b253a6be72fd14fa5acecec3f2c824622cabc0