Refactor WebApkServiceConnectionManager.

chrome/android/webapk/libs/common/BUILD.gn

Index: chrome/android/webapk/libs/common/BUILD.gn
diff --git a/chrome/android/webapk/libs/common/BUILD.gn b/chrome/android/webapk/libs/common/BUILD.gn
index 812295cf55cb7101b841e30e796fe0700b96240a..9d279cd200528eae607dda26721273ba3ee9ddef 100644
--- a/chrome/android/webapk/libs/common/BUILD.gn
+++ b/chrome/android/webapk/libs/common/BUILD.gn
@@ -10,4 +10,14 @@ android_library("common_java") {
     "src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java",
     "src/org/chromium/webapk/lib/common/WebApkVersionUtils.java",
   ]
+  srcjar_deps = [ "//chrome/android/webapk/libs/common:identity_service_aidl" ]
+}
+
+android_aidl("identity_service_aidl") {
+  import_include = [ "src/org/chromium/webapk/lib/common/identity_service" ]
+  interface_file =
+      "src/org/chromium/webapk/lib/common/identity_service/common.aidl"
+  sources = [
+    "src/org/chromium/webapk/lib/common/identity_service/IIdentityService.aidl",
+  ]
 }