Snap for 7468467 from d04e6bd6926e8f98370ac631e44c10e7b47502c9 to mainline-mediaprovider-release

Change-Id: I7af288f9864070827f6609c65987b6c1603f21f5
tree: 8dc469e64364fb85fbfbfebe72e96676963beb43
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS