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

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

Change-Id: Ia2ca18a4f53a3c78bedac23067a79e609125d519