Merge "Move atrace init into on fs trigger" am: 8fee401726 am: 23c7fe7195
am: 7247edd7ad

Change-Id: I6a987ded104c4237b2a373e2686b2c2d1232d2ed