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

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

Change-Id: I47e0b707d4b636cf0483b6a0545c5769657a34c0