Merge "Add debugDump() to IServiceManager." am: d8c6d98ebb
am: 09d957bf19

Change-Id: I5adb531893cacb2b677f3d8f27be99220617143a