Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: a4838ac96e am: 2ffa017167 am: 11d36f6b01

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

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