Add Y611 to setOutputSurfaceWorkaround

Issue: #3724

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=185548632

RELEASENOTES.md

@@ -91,8 +91,9 @@
     * Fix handling of ad tags where ad groups are out of order
     * Fix handling of ad tags where ad groups are out of order
       ([#3716](https://github.com/google/ExoPlayer/issues/3716)).
       ([#3716](https://github.com/google/ExoPlayer/issues/3716)).
 * `EventLogger` moved from the demo app into the core library.
 * `EventLogger` moved from the demo app into the core library.
-* Fix ANR issue on Huawei P8 Lite
-  ([#3724](https://github.com/google/ExoPlayer/issues/3724)).
+* Fix ANR issue on the Huawei P8 Lite, Huawei Y6II and Moto C+
+  ([#3724](https://github.com/google/ExoPlayer/issues/3724),
+  [#3835](https://github.com/google/ExoPlayer/issues/3835)).
 * Fix potential NPE when removing media sources from a
 * Fix potential NPE when removing media sources from a
   DynamicConcatenatingMediaSource
   DynamicConcatenatingMediaSource
   ([#3796](https://github.com/google/ExoPlayer/issues/3796)).
   ([#3796](https://github.com/google/ExoPlayer/issues/3796)).

library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java

@@ -1094,7 +1094,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
                 || "BRAVIA_ATV2".equals(Util.DEVICE)
                 || "BRAVIA_ATV2".equals(Util.DEVICE)
                 || "panell_s".equals(Util.DEVICE))
                 || "panell_s".equals(Util.DEVICE))
             && "OMX.MTK.VIDEO.DECODER.AVC".equals(name))
             && "OMX.MTK.VIDEO.DECODER.AVC".equals(name))
-        || ("OMX.k3.video.decoder.avc".equals(name) && "ALE-L21".equals(Util.MODEL));
+        || (("ALE-L21".equals(Util.MODEL) || "CAM-L21".equals(Util.MODEL))
+            && "OMX.k3.video.decoder.avc".equals(name));
   }
   }
 
 
   /**
   /**