Merge "Get service PID from dumpsys in bugreports"