[automerger skipped] Merge "Move media provider related hidden API flag file...

[automerger skipped] Merge "Move media provider related hidden API flag file entries to packages/providers/MediaProvider" am: 0a0f6450 am: e0211571 -s ours am: 66f15ea9 -s ours am: 5278294b -s ours

am skip reason: Merged-In I0615b68715de2bb953da27b60d29d37b2750d86b with SHA-1 dd764079 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1769686

Change-Id: Iaadbe2360206dacb6df388e8e2719d02c901e30d