Move atrace init into on fs trigger am: f920891b71
am: dc34164cef

Change-Id: I30a5063ae24b21f38945b581d1bfbe67390667f6