[automerger skipped] Open all files with O_NOFOLLOW. am: b50868065a am: a1b1ca446a -s ours am: b3e5b95de0 -s ours am: f28fc05cc3 -s ours am: a5069f3e61 -s ours am: c784520e0c -s ours

am skip reason: Merged-In Idb1f3ee1db90913a97a50515003f211519037066 with SHA-1 9a497640c7 is already in history

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

Change-Id: I7d757d5e53931f0fe4356e6ea93b1e4ef6a1788a