instument cluster api review

- String to CharSequence for event name
- @IntDef clean ups
- void for set* APIs
  App will lose app focus and will know it anyway.

bug: 31930987

Change-Id: Ic84c0a0bbe2980f51c3c260f5aa1181bf1b9bbe3
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index c5b91af..45a5707 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -323,7 +323,7 @@
   public abstract class NavigationRenderer {
     ctor public NavigationRenderer();
     method public abstract android.car.navigation.CarNavigationInstrumentCluster getNavigationProperties();
-    method public abstract void onNextTurnChanged(int, java.lang.String, int, int, android.graphics.Bitmap, int);
+    method public abstract void onNextTurnChanged(int, java.lang.CharSequence, int, int, android.graphics.Bitmap, int);
     method public abstract void onNextTurnDistanceChanged(int, int, int, int);
     method public abstract void onStartNavigation();
     method public abstract void onStopNavigation();
@@ -814,18 +814,15 @@
     method public int getImageColorDepthBits();
     method public int getImageHeight();
     method public int getImageWidth();
-    method public int getMinIntervalMs();
+    method public int getMinIntervalMillis();
     method public int getType();
     method public boolean supportsCustomImages();
     method public void writeToParcel(android.os.Parcel, int);
+    field public static final int CLUSTER_TYPE_CUSTOM_IMAGES_SUPPORTED = 1; // 0x1
+    field public static final int CLUSTER_TYPE_IMAGE_CODES_ONLY = 2; // 0x2
     field public static final android.os.Parcelable.Creator<android.car.navigation.CarNavigationInstrumentCluster> CREATOR;
   }
 
-  public static abstract class CarNavigationInstrumentCluster.ClusterType implements java.lang.annotation.Annotation {
-    field public static final int CUSTOM_IMAGES_SUPPORTED = 1; // 0x1
-    field public static final int IMAGE_CODES_ONLY = 2; // 0x2
-  }
-
 }
 
 package android.car.settings {