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

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