Merge "Revert "Don't initialize atrace if it's already disabled."" am: c50d19c0b0
am: 33d3758684

Change-Id: I46f1627713be963686a5f5d36e5af24e2cd25626