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

Change-Id: I92502fcf5adad5b8a88b2811efb8a3083b68ed6c