Merge "Added support to capture profile trace based on PID" am: 2719ff2971 am: 087d1f6d59

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1988391

Change-Id: Iae6b10cd74442d764f004bcb287af090ecabef2c