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

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