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

Change-Id: I5f9e22a6eef80d97dc8f5bcbca05e65014f0f147