Merge "DrmManager: locally aggregate API metrics"