[automerger skipped] Merge "Remove old dumpstate aidl methods" am: 6f65b7f0dd am: 64fa943a29 am: 9a3eb1fc99 am: 4b40766c72
am: 855f5c337a -s ours
am skip reason: change_id Id9103649b0f7c8e6ea0b79583ea04825cb5b455f with SHA1 402a839ef5 is in history

Change-Id: I6409f92f5ab0817a0824e72cd1c2115950bbf8ba