Merge "Fix dumpstate AIDL interface API comments"