Merge "media modules get more descriptive *.rc filenames" into tm-dev am: 82a4a390 am: ecc1655d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17411355



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