Merge changes Ic9b9cef4,I5e807b64 am: 9779dd4a6a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2026615

Change-Id: Id51bd25eab7c06272bf856a0c0b54f6feb67d4db
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index ec67312..81fcf7a 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -800,10 +800,6 @@
         }
     }
 
-    // NOTE: Any new formats that are added must be coordinated across different
-    // Android users.  This includes the ANGLE team (a layered implementation of
-    // OpenGL-ES).
-
     VkResult result = VK_SUCCESS;
     if (formats) {
         uint32_t transfer_count = all_formats.size();