Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9e5

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

Change-Id: I35e4304d472aa1a307bcf7c0720a555a28a80455