[automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5 am: 46201ccf32 -s ours am: f357ca6357

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

Change-Id: I76ff639e1fec4f4dd3a33042596b3d92306d1b34