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

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

Change-Id: Ia11fdd1eb26f2b215b0d081e50d080accdcbbbbb