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

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

Change-Id: Iecec4d0df333caf07a209e4f0c3ea3e8bdd07341