Merge "atrace: Don't output service lookup/notification errors." am: 9753b43355 am: acc03d821b am: b4951bb3c5
am: c874bf6032

Change-Id: I2f82d450a9a07d1a30b8017e34ad1f158fac3eec