Merge "Remove old dumpstate aidl methods"
am: 6f65b7f0dd

Change-Id: I80ba00314a6809d38ee21cec7193dadf6a06fbaf