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

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

Change-Id: I1b902c5c2cae17ad2002e0275026746a4c84a737
tree: 386f3f9e6491139cf195f27e00dc932fbafe9966
  1. apex/