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

Change-Id: Id7e21b0b4c5a182b24b229298a56f5508bedef31