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

Change-Id: I83fe8ebba58adbcdf872ca64a33c7ebb1ee6dd60