Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev