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

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

Change-Id: I955241d2152fdfeec052d69b1d299dce7e478618