[automerger skipped] Merge "profcollectd: Avoid hard-coding Betterbug name"...

[automerger skipped] Merge "profcollectd: Avoid hard-coding Betterbug name" am: adcff137 am: f80edee1 -s ours am: 82c2e781 -s ours

am skip reason: Merged-In Ib398f34825233db1b9a9f2e4da78c7ce35953164 with SHA-1 2d17c284 is already in history

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

Change-Id: I47f903352b10f73c0ed8663e4f796344dffe3c70