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

Change-Id: Ib716d17dbded1d281c2dbd33b8e0a6e8c915e52c