Merge "Do not send Binder/HIDL transactions from atrace." am: 7fc9d8675e am: 43ce91c321

Change-Id: I0f6f725d07549f91bf1b2094e91b0f266ae4aa27