Merge "Ensure all android.process.media apps have usesCleartextTraffic=true" am: 4c5c25d31b am: f9800f2151
am: b0769c19a7

Change-Id: If9718213c0463f6de3e567c54a5633b79f297e63