Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 6542270a1f

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

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