Add a couple of fields into Smartspace atom proto
    1. Package uid
    2. Interacted subcard rank and cardinality
    3. Change card_type from enum to int

BUG: 183117427,196637550
Test: n/a
Change-Id: I9676715b8f5d4c548e1d030b709232ae00bcee30
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 0d797e5..211e344 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -3584,13 +3584,25 @@
     // Uniquely identifies a card. Should persist through updates.
     optional int32 instance_id = 2;
     // Uniquely identifies one of the possible types of the SmartSpace cards.
-    optional CardType card_type = 3;
+    // Deprecated. Please read card_type_id instead.
+    optional CardType card_type = 3 [deprecated = true];
     // Location of the card when the event occurred.
     optional DisplaySurface display_surface = 4;
     // The position of the card in the carousel when the event occurred.
     optional int32 rank = 5;
     // The number of cards shown to the user.
     optional int32 cardinality = 6;
+    // Uniquely identifies one of the possible types of the SmartSpace cards.
+    // To replace card_type. See go/smartspace-aster-metrics#card-type-id.
+    optional int32 card_type_id = 7;
+    // The app that the Smartspace card is tied to.
+    optional int32 uid = 8 [(is_uid) = true];
+    // If multiple subcards are displayed simultaneously, the position of
+    // the subcard that was interacted with.
+    optional int32 interacted_subcard_rank = 9;
+    // If multiple subcards are displayed simultaneously, the number of subcards
+    // shown when the interaction occurred.
+    optional int32 interacted_subcard_cardinality = 10;
 }
 
 /**