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

Change-Id: I1ac305c95d59ef41d6e17ee3c8836d227bb1ded1