Merge "dumpsys: '-l' works for 0/1 services." am: d59ca09f5f am: accfd76421

Change-Id: I7ada448a7509d522859839dd0607cbce565e963f