Merge "profcollect/betterbug integration with content uri" am: 0849b350 am:...

Merge "profcollect/betterbug integration with content uri" am: 0849b350 am: 282fa75f am: 3e625806 am: 6e3982e7 am: b91f1f4e

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

Change-Id: I455509f53d2a15b0c09a7fc7e198b4faa6c03cbc