Merge "atrace: add thermal trace to user build"