[automerger skipped] Run bugreport unit test without script am: 31f9d09b am: 5974c9fa am: d37c334b am: 5fbf8a6a -s ours

am skip reason: Change-Id Id930abc40c52441c6dd1c1e6cdc3c0f34a36bfca with SHA-1 7a0bac8d is in history

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

Change-Id: Iba14ef8e6721a31c95a61d7f0a27c184da102801