Merge "Use the standard class name for dumpable keys" into main am: ebb295244d

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

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