Merge "Atrace: Add the debug.atrace.user_initiated property."