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

am skip reason: subject contains skip directive

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

Change-Id: Ibf0ff9cc2e6381fe70f3f4a0c93b0bbab25fdadc