Merge "Increase core count in atrace.rc" am: 40fcf7c2e3 am: a5247d33b8

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

Change-Id: Id5979a6d35eb2b7c695e8cebc9bbf12235e78ac5