Merge "Rename framework-media-sources" am: 365a2bab75 am: 5d88388c85

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

Change-Id: I520321cfaab4563911880a592072f9e288901299