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

Change-Id: I45a9525b275bb0b327fce9982901b8e3304e2783