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

Change-Id: If4b133643cabbf657a96aff6d729fda09571d133