Bug: 74173212 Test: VideoViewTest app Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79 (cherry picked from commit a0fdcc97)