Merge "Merge "MediaMetricsManagerService: Unify logSessionId representation" into sc-dev am: 91327adeda am: f2df86d9f1"

services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java

@@ -195,7 +195,7 @@ public final class MediaMetricsManagerService extends SystemService {
         }
 
         private String getSessionIdInternal(int userId) {
-            byte[] byteId = new byte[16]; // 128 bits
+            byte[] byteId = new byte[12]; // 96 bits (128 bits when expanded to Base64 string)
             mSecureRandom.nextBytes(byteId);
             String id = Base64.encodeToString(
                     byteId, Base64.NO_PADDING | Base64.NO_WRAP | Base64.URL_SAFE);