Merge "atrace: add database tag" am: 8b9c0e1af1
am: 361515a9b5

* commit '361515a9b5c64f625305d0824048bb65a71c9595':
  atrace: add database tag