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

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

Change-Id: Id5c9660e7161e5c1f59bbbe3d02d1bcd30b6f21d