Merge "Atrace: Add the debug.atrace.user_initiated property." into pi-dev
am: 56f68366f0

Change-Id: Ie167672ae97f7c7d221afe127323e457505513b7