[automerger skipped] DO NOT MERGE Open all files with O_NOFOLLOW. am: 8ca6dd56fd -s ours am: da6615572c -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: Ifa625feefe9d56f1e3df3676de634e597a46c65b