Merge "profcollect/betterbug integration with content uri" am: 0849b35051 am: 282fa75f5e

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

Change-Id: I97977f160adf82834d647650f8318c5c77eaa4d9