[automerger skipped] Merge "Use the standard class name for dumpable keys" into main am: ebb29524 am: 92bc00c1 -s ours

am skip reason: skipped by jdduke

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



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