Merge "atrace: speculative fix for missing ATRACE_TAG_APP events" into main