Keystore2 Metrics: System server rerouting

System server changes for rerouting keystore atoms.

Bug: 191050796
Bug: 188590587
Test: statsd testdrive
Change-Id: Id4d0880c4a8a53097ca7007c40026d2d4bc0bc5b
diff --git a/Android.bp b/Android.bp
index 71023bf..c450acf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -104,6 +104,7 @@
         ":android.security.apc-java-source",
         ":android.security.authorization-java-source",
         ":android.security.maintenance-java-source",
+        ":android.security.metrics-java-source",
         ":android.security.vpnprofilestore-java-source",
         ":android.system.keystore2-V1-java-source",
         ":credstore_aidl",