Merge "Merge "Clear calling id before updating MediaStore." into oc-dr1-dev am: 28042d09d1" into oc-dr1-dev-plus-aosp
am: 083a491f4d

Change-Id: I293ca3e7765629a1f04e14aad2841bcb7d1f763a