Merge changes from topic "dumpDebugComponent" am: 7cdceb427d am: 9e289cdad2 am: 2cb8bad44c

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

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