Merge "Don't initialize atrace if it's already disabled."
am: 0e239bbd8b

Change-Id: I3839188718fe70fb6e0bb94aacd2dc8de7612654