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

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

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

Change-Id: I166c5b521671242d977e252d264859c4d236a0a6