Merge "Incident dump does not include current bucket" into rvc-dev am: 298dd714 am: 35333908 am: 8bcd7593 am: b598b844

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

Change-Id: I56d5fe79e4efa2b03489eb894298b798c1ef138a