[automerger skipped] Merge Android 12 am: 4e1e27e44c -s ours am: 46699ba577 -s ours am: c898be229f -s ours am: a191bb1788 -s ours am: 7810903e9d -s ours

am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history

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

Change-Id: Idcc2d3ed10ed3388dcc58b15acabbe928a73c6f2