Merge "Get service PID from dumpsys in bugreports" am: 19ce0cba3e am: c2f6b4f403

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2456193

Change-Id: Icf96e006a417cfdcdf93c1b5f9ad68b20995a72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>