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

Change-Id: I9db0bb88d1fe67744d7d2718c9f5d596667f45c4