[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 4d17d097be -s ours am: 494447b1e5 -s ours

am skip reason: Change-Id I14d7f590626ed952689da92e72b4f0be8fff752f with SHA-1 658fa7f244 is in history

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

Change-Id: I62429eccce2f94427d42b4590879495787983b7c