[automerger skipped]Merge "Add new trace tag for AIDL." am: 80dce0127c
am: f7a1378384  -s ours

Change-Id: Ieb10fb76f22d7047b6430691918d53d07e8eb0f9