[automerger skipped] DO NOT MERGE Temporarily rename the package name of BugReportApp am: 2812c3b042 am: d2704f1693 -s ours am: 0bdf68400b am: f070dfbb12 am: 2cb31cdca2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0e33b3b872639b818a1c42f7dd0c3e7ffbb6f776