[SPARK-24935][SQL][2.3] fix Hive UDAF with two aggregation buffers#24539

cloud-fan wants to merge 2 commits intoapache:branch-2.3apache/spark:branch-2.3from

cloud-fan:backportcloud-fan/spark:backportCopy head branch name to clipboard