[automerger skipped] Merge "Merge Android R" am: df6bc4ade7 -s ours am: b87eb87a65 -s ours

am skip reason: Change-Id I8f8254a06d6b6fdb726dbe8bcc162ef5a99fc546 with SHA-1 4d17d097be is in history

Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/1422380

Change-Id: I5a6d0b5fec102f87b7e1e0f0e762499c86496df1