Merge "Use FileProvider rather than sharing raw file URI" am: 4c8f1072 am: 8d4ae91f am: 03716bc8 am: f0518c4f Change-Id: I4de6c62a8791894f85c88045a084efbf1a280771