Snap for 15081330 from 043b9db59acfe462c7c2f4c29adf57225426e688 to 26Q2-release

Change-Id: Id93b2e6b4b709aab3fa99c7536f5f63ca488eb21

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index a8f31c3..a2c6137 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -20671,7 +20671,7 @@
   <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#RAW14">RAW14</a></li>
 <li>Processed (but not-stalling): any non-RAW format without a stall duration.<wbr/>  Typically
   <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">YUV_<wbr/>420_<wbr/>888</a>,<wbr/>
-  <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#NV21">NV21</a>,<wbr/> <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YV12">YV12</a>,<wbr/> or <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">Y8</a> .<wbr/></li>
+  or <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">Y8</a> .<wbr/></li>
 </ul>
             </td>
           </tr>
@@ -20806,8 +20806,6 @@
 Typically:</p>
 <ul>
 <li><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">YUV_<wbr/>420_<wbr/>888</a></li>
-<li><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#NV21">NV21</a></li>
-<li><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YV12">YV12</a></li>
 <li>Implementation-defined formats,<wbr/> i.<wbr/>e.<wbr/> <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#isOutputSupportedFor(Class)">StreamConfigurationMap#isOutputSupportedFor(Class)</a></li>
 <li><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">Y8</a></li>
 </ul>

camera/docs/metadata_definitions.xml

diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 9d7de56..3491e57 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -6131,9 +6131,7 @@
             {@link android.graphics.ImageFormat#RAW14|AIMAGE_FORMAT_RAW12 RAW14}
           * Processed (but not-stalling): any non-RAW format without a stall duration.  Typically
             {@link android.graphics.ImageFormat#YUV_420_888|AIMAGE_FORMAT_YUV_420_888 YUV_420_888},
-            {@link android.graphics.ImageFormat#NV21 NV21}, {@link
-            android.graphics.ImageFormat#YV12 YV12}, or {@link
-            android.graphics.ImageFormat#Y8|AIMAGE_FORMAT_Y8 Y8} .
+            or {@link android.graphics.ImageFormat#Y8|AIMAGE_FORMAT_Y8 Y8} .
           </details>
           <tag id="BC" />
         </entry>
@@ -6190,8 +6188,6 @@
           Typically:
 
           * {@link android.graphics.ImageFormat#YUV_420_888|AIMAGE_FORMAT_YUV_420_888 YUV_420_888}
-          * {@link android.graphics.ImageFormat#NV21 NV21}
-          * {@link android.graphics.ImageFormat#YV12 YV12}
           * Implementation-defined formats, i.e. {@link
             android.hardware.camera2.params.StreamConfigurationMap#isOutputSupportedFor(Class)}
           * {@link android.graphics.ImageFormat#Y8|AIMAGE_FORMAT_Y8 Y8}