Merge "Avoid crashing in RunDumpsysProto when not zipping" into pi-dev
am: f7a23bd97a

Change-Id: I176bb670484a727b067aafeec98e0f08dd575ad7