Android 11.0.0 Release 36 (RQ2A.210505.002)
[automerger skipped] Updating VideoPlayer as per androidx.media library changes am: 08320e11d6 am: 287097108b
am: 73aa04b463 -s ours
am skip reason: change_id I814a25181c27bab73c146d5eb117d56f3264452c with SHA1 197cc87be8 is in history

Change-Id: I7b1c7b957daadf76cd60aba824d419ef587597a6