Merge "mediadrm: new IDrmMetricsConsumer interface"