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

Change-Id: Id61287c635379735bc0c78dea8571720594de52f