[automerger skipped] Merge "Remove apex/media - migrated to...

[automerger skipped] Merge "Remove apex/media - migrated to packages/modules/Media" am: 8aa8ce4f am: 15d4890f am: 8e29bf43 -s ours am: c51be5e5 -s ours

am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde is already in history

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

Change-Id: Ice44313ca81b3d88c71117606870de8a58f705c5