Revert "Use aidl interface for Widevine service."

This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
(cherry picked from commit a4d835af3a)
Merged-In:I9c42df15defec428c9ef8c62439c63d4a603fee6

libwvdrmengine/cdm/metrics/include/metrics_collections.h

@@ -156,7 +156,7 @@ class CryptoMetrics {
       crypto_session_load_certificate_private_key_;
   // This uses the requested security level.
   EventMetric<kErrorCodeFieldNumber, CdmResponseType, kSecurityLevelFieldNumber,
-              RequestedSecurityLevel>
+              SecurityLevel>
       crypto_session_open_;
   ValueMetric<uint32_t> crypto_session_system_id_;
   EventMetric<kErrorCodeFieldNumber, CdmResponseType>

libwvdrmengine/cdm/metrics/src/attribute_handler.cpp

@@ -33,9 +33,8 @@ void SetAttributeField<drm_metrics::Attributes::kCdmSecurityLevelFieldNumber,
 
 template <>
 void SetAttributeField<drm_metrics::Attributes::kSecurityLevelFieldNumber,
-                       RequestedSecurityLevel>(
-    const RequestedSecurityLevel& security_level,
-    drm_metrics::Attributes* attributes) {
+                       SecurityLevel>(const SecurityLevel& security_level,
+                                      drm_metrics::Attributes* attributes) {
   attributes->set_security_level(security_level);
 }
 

libwvdrmengine/cdm/metrics/test/counter_metric_unittest.cpp

@@ -112,7 +112,7 @@ TEST(CounterMetricTest, FourFieldsSuccess) {
                 drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
                 drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool,
                 drm_metrics::Attributes::kSecurityLevelFieldNumber,
-                RequestedSecurityLevel>
+                SecurityLevel>
       metric;
   metric.Increment(10LL, 7, Pow2Bucket(13), true, kLevel3);