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

Change-Id: Ibb5370034f45a00e1ec9166abc4a66afc32b4847