Merge "Ignore dumpsys -a option" into pi-dev
am: eb71027d25

Change-Id: Ie1becdc71094339a953cb2858f5cc0fedbb353de