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: I9a7224a28d03cbbe5cb8d4a54bf035a787f25024