aml_mpr_340919000 (10514023,com.google.android.mediaprovider)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24080306'] into mainline-mediaprovider-release.

Change-Id: I27eef395b342cd9907fe4855a3595b35368efe7a
tree: 983a93667d5276ad9a55c9a312f3539a24e696d3
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. 5/
  6. 7/
  7. 8/
  8. current/
  9. OWNERS