[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d436784986 -s ours

am skip reason: Merged-In I5f4b865f48965e3967c156bcdfe7cde4993b1f92 with SHA-1 50a0ef47c1 is already in history

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

Change-Id: Ia2bd2ac480d090ce16f9d0c189e5602e22ffc40b