Merge "Move out mediaprovider allowlist entries" into tm-dev