Merge "Fixes ActivityDumpTest.testAddDumpable_oneOnly()"