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

Change-Id: I29b452dbb955d65806cd472cf20d4595ac4844dc