Merge "Move basic events into the sched category in atrace." into qt-dev
am: a7004b29e1

Change-Id: I1c8578ee794ed0e324f346db156de1f7e35b42fb