Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cf am: 5d27eda956 am: 1797a76242

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

Change-Id: I99c86dcc99d61a059cd4475f0d737ad5d0b5b3f5