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

Change-Id: Id29974c68fbe8225b24182dd7e8e910e1921b44a