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

Change-Id: I1c212df23c7f42b113015aa76cd79ceab65399d4