Move atrace init into on fs trigger am: 23d0302561 am: 53389b089c
am: 6a67872673

Change-Id: I9b0a0469d6308ef9ff6db68191d39644ec5f3382