[automerger skipped] Merge "Manually register Dumpables to DumpManager" into...

[automerger skipped] Merge "Manually register Dumpables to DumpManager" into sc-v2-dev am: 768b3fb7 am: d0ed9d71 -s ours

am skip reason: Merged-In Ie02a44fb7da0b76bf53da874cc9eee030a1b9173 with SHA-1 3aca431b is already in history

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

Change-Id: If50a56704aa6f8e945f4f011d2d5493ba191b3af