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

Change-Id: Ia6e6d21a3fd1519667d8996946ae88241fb46cbb