Merge "MediaDrm jni: use DrmMetricsConsumer"