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

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

Change-Id: I46dbfac96af0fc5fa402140a19e986a5eeb378ba