Merge "Add test config to dumpsys_test" am: cf617abcb2 am: c19f57f08e
am: e678a5ad0a

Change-Id: Ia879ceb72a4d8ba3763b026bf42cfa08ea81ca9c