[automerger skipped] Merge "Move media provider related hidden API flag file entries to packages/providers/MediaProvider" am: 0a0f645011 am: e02115712f -s ours am: 66f15ea9d7 -s ours
am skip reason: Merged-In I0615b68715de2bb953da27b60d29d37b2750d86b with SHA-1 dd7640795c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1769686
Change-Id: I664eda4fff8d8a22fdb24c48bbb82f66f183a978
This commit is contained in: