Merge "profcollectd: Allow specifying the profile id which BetterBug is using" am: a49cbf9002 am: 148c3ed0a1

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

Change-Id: I747cae169b9f33502b50d328415a556c6c5b16e7