[automerger skipped] [conflict] RESTRICT AUTOMERGE Display the system gallery storage permission as system fixed am: 679dfe05cd am: 66ffb1f1b7 -s ours am: 355e6d895b -s ours am: 026c8c8b9f -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/31575308

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