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

Change-Id: I87917d89160271a635ac1a42728fb643e1df99ae