[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 129dd212d0 -s ours

am skip reason: Change-Id Ic74a2773a0813d4d85113ad91ecc5df7f9ce140b with SHA-1 88a8d50239 is in history

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

Change-Id: Iada42f63d86ee3eb57855119a375d27fca2c757f