[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829 -s ours am: 53ff99b8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: Ie3e897ff1e8259b5d24dc1291e0683f325c2d7fe