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

Change-Id: Iaf97d7dd182f91d2f29c7a045549813d70a754b8