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

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

Change-Id: Ide35841d9a14fbd1726a19c12c50067bb9d4c4cf