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