Merge "Allow framework-media to build the framework-media.impl" am: fb14b527 am: 79c44417

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359



Change-Id: I80bead78c74f6f3335ee68d4138f99868542e46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>