Merge "Remove apex/media - migrated to packages/modules/Media" am: 8aa8ce4f91 am: 15d4890f9c

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

Change-Id: I55d97c0a74a528ee6950f68c7c04f0cee82461e0