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

Change-Id: I7c75051c1dab9b7c8b0bcc0286b42d3ade4b1dac