Android R Preview 4 (RPP4.200409.015)
Updating VideoPlayer as per androidx.media library changes am: 08320e11d6
am: 287097108b

Change-Id: Ie3139884815b51f5c45f504ded4358e91fb44d5e