[automerger skipped] Merge "audioflinger: Add tracing for direct tracks" am: 1de381858f am: 7829e89a8b am: aaf361b751
am: 30ae01c81c -s ours
am skip reason: change_id Iee6ea72442f9902819628735e19cce0ba1546165 with SHA1 ddb07bc143 is in history

Change-Id: I2ac621ab80feee13bbf67e2eab007697e073c942