Merge "Atrace: Add the debug.atrace.user_initiated property." am: d9671a4aa0
am: 8fce1536ff

Change-Id: Ib6b67635d328d03bb326bf309a3abe5bcc83f440