Merge "Remove old dumpstate aidl methods" am: 6f65b7f0dd am: 64fa943a29 am: 9a3eb1fc99
am: 4b40766c72

Change-Id: I211e13dd9fceee276c781c060ff6ecda6982a598