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

[automerger skipped] Merge "Move media related hidden API flag file entries to frameworks/av" am: 7094e821 am: 0c671e5c -s ours am: 7e5e9d71 -s ours

am skip reason: Merged-In I0dea4284723835c0592ce9aaf7382e344ae959f7 with SHA-1 5283c3cf is already in history

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

Change-Id: I14314a35e9727fa8605d61b4d166186b3c7ced3f