[automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name...

[automerger skipped] Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp" am: 5218a1f9 am: 46201ccf -s ours am: f357ca63 am: a9867b9a am: a8e0b66a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06b5146ced6e0ffaa44b1b610238c093391d798e