Merge "profcollect: attempt to upload reports if BetterBug is available" am: c01d2f4258 am: a21c2bc3a9

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

Change-Id: Ida3618dfd2ed418d24c453c4556fd4085f816108