Merge "Add method to return merged stats to AIDL"