am cade4089: Merge "Fix issue #11113111: `dumpsys activity service` is broken" into klp-dev

* commit 'cade4089e75df2c9ef86aa1a37f3396e0d4b57d5':
  Fix issue #11113111: `dumpsys activity service` is broken