Merge "atrace.rc: move to post-fs trigger"
am: 3749a60b42

Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649