[automerger skipped] Increase core count in atrace.rc am: 4d9c4e1413 -s ours am: b149646c63 -s ours

am skip reason: Merged-In I4c7b0ba6a4883cc21f45428368b60759c54ef985 with SHA-1 2895eeb632 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16144735

Change-Id: I34d1b5c3007344c704e6c0d6aa621452a36b14d5