am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad

* commit 'b27668f0d0a1d5049759a8448e1701e199e05c71':
  Only delete the Uri coming from onMediaSaved