Merge "profcollect/betterbug integration with content uri" am: 0849b35051 am: 282fa75f5e am: 3e6258066e am: 6e3982e7b7

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

Change-Id: Idb29c661a6f13445c16122e0b6110e747294f576