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

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

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

Change-Id: Ia402337088c8af9e889682b9ab290f550b65598a