Merge "Add "uses-sdk" to AndroidManifest for ActivityManagerPerfTests"