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

Change-Id: If2e3b35f9b30b560a96eab8cc4ac3403cbbf0825