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

Change-Id: I55076549651d386ed7bdfab8ec05061049735271