[automerger skipped] Merge "Remove apex/media - migrated to packages/modules/Media" am: 8aa8ce4f91 am: 15d4890f9c am: 8e29bf43bc -s ours

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

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

Change-Id: Iaf5e512079f7a126e644c129c846e3446750beb1