Merge "Added test cases to dumpsys." am: 5cfc1c0546
am: 74ee4a06a3

Change-Id: I5e536d12eef0ff8d41030f037f309f67c880b2a7