[automerger skipped] Merge "Remove FileDescriptor from systemui.Dumpable."...

[automerger skipped] Merge "Remove FileDescriptor from systemui.Dumpable." into tm-dev am: 22149274 am: 31fc4ed1 am: 60eb9efd -s ours

am skip reason: Merged-In Ibaebcfb2c6c5326d0c45b8c72d868c76655d89a0 with SHA-1 96985e52 is already in history

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



Change-Id: Ib7cc364d031360fae5744a392903e04c8040bf7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>