Merge "profcollectd: Avoid hard-coding Betterbug name" am: adcff13790

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1746775

Change-Id: I18ba4c340edf0de8cff4835fa3ef754b086e21c1