Merge "Update comments on why we are suppresing the NotCloseable lint warning" into androidx-master-dev
diff --git a/car/app/app/src/main/java/androidx/car/app/CarAppService.java b/car/app/app/src/main/java/androidx/car/app/CarAppService.java
index 58a108f..ecfad77 100644
--- a/car/app/app/src/main/java/androidx/car/app/CarAppService.java
+++ b/car/app/app/src/main/java/androidx/car/app/CarAppService.java
@@ -60,8 +60,9 @@
  * href="https://developer.android.com/guide/components/services?#Types-of-services">foreground
  * service</a>.
  */
+// This lint warning is triggered because this has a finish() API. Suppress because we are not
+// actually cleaning any held resources in that method.
 @SuppressWarnings("NotCloseable")
-// TODO(rampara): Implement AutoClosable and CloseGuard.
 public abstract class CarAppService extends Service implements LifecycleOwner {
     private static final String TAG = "CarAppService";
     private static final String AUTO_DRIVE = "AUTO_DRIVE";
diff --git a/car/app/app/src/main/java/androidx/car/app/Screen.java b/car/app/app/src/main/java/androidx/car/app/Screen.java
index d78d413..62158f0 100644
--- a/car/app/app/src/main/java/androidx/car/app/Screen.java
+++ b/car/app/app/src/main/java/androidx/car/app/Screen.java
@@ -50,8 +50,9 @@
  *
  * <p>Screen objects are not thread safe and all calls should be made from the same thread.
  */
+// This lint warning is triggered because this has a finish() API. Suppress because we are not
+// actually cleaning any held resources in that method.
 @SuppressWarnings("NotCloseable")
-// TODO(rampara): Implement AutoClosable and CloseGuard.
 public abstract class Screen implements LifecycleOwner {
     /**
      * A marker to use with {@link ScreenManager#popTo} when it should pop all the way to the root