Bug: 111098596 Test: atrace/systrace (cherry picked from commit 9ed5cf6e43) Change-Id: I97772ff21754d03a0aea0d53b39e8da5312a17c0
9ed5cf6e43