Merge commit 'a03a144bd88fc013046cef9da3adf7672d2acde5' of sso://googleplex-android/platform/packages/providers/MediaProvider into HEAD
Change-Id: I04f93b51827219cbad34d64c34516fda44612ba4