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

Change-Id: I9ba3c80074baacd247bd8753cea071e5e388c67f