Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714eb

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

Change-Id: I3529a17b6a8e2bcaeb4fc47ec72053b9761ff6a4