[automerger skipped] Merge "Move basic events into the sched category in atrace." am: 7aaa254814
am: dd91221342 -s ours
am skip reason: change_id Ib6bd958c1b873acfa8b04a79fc2b9b65a529d768 with SHA1 63ea291ddb is in history

Change-Id: I9a763c38c274a6699d868b5724ec10f59abdd0a8