am cbe97288: am 4c1abd8f: Merge "restore functionality to \'dumpsys activity\' logs" into ub-gmail-ur14-dev

* commit 'cbe972887ad60b9c1dbf14cd5f00524aab35b449':
  restore functionality to 'dumpsys activity' logs